(set-visited-file-name): Unlock the file if setting the visited file name to

nil.

diff --git a/lisp/files.el b/lisp/files.el
index aac5ebb1a64253b9cc18e8e07cf6c882fa0f5861..1ca1369d250e4fe607dbe08fa0f64d48cfcf200c 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1151,9 +1151,8 @@ if you wish to pass an empty string as the argument."
                nil
              (expand-file-name filename))))
   (or (equal filename buffer-file-name)
-      (null filename)
       (progn
-       (lock-buffer filename)
+       (and filename (lock-buffer filename))
        (unlock-buffer)))
   (setq buffer-file-name filename)
   (if filename                         ; make buffer name reflect filename.